shortcutcontroller: Check for NULL GtkNative of widget
authorTimm Bäder <mail@baedert.org>
Thu, 30 Apr 2020 09:03:14 +0000 (11:03 +0200)
committerTimm Bäder <mail@baedert.org>
Tue, 5 May 2020 06:20:10 +0000 (08:20 +0200)
And just continue in that case.

gtk/gtkshortcutcontroller.c

index 33199ee5d63abb3bfcf5139f47bde0c8abebc3f7..99fa997b767c046e8f8ee8f4699d716262a2b53d 100644 (file)
@@ -342,10 +342,16 @@ gtk_shortcut_controller_run_controllers (GtkEventController *controller,
             widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (model));
         }
 
+      if (!_gtk_widget_is_sensitive (widget) ||
+          !_gtk_widget_get_mapped (widget))
+        {
+          g_object_unref (shortcut);
+          continue;
+        }
+
       native = gtk_widget_get_native (widget);
-      if (!gtk_widget_is_sensitive (widget) ||
-          !gtk_widget_get_mapped (widget) ||
-          !gdk_surface_is_viewable (gtk_native_get_surface (native)))
+      if (!native ||
+          !gdk_surface_is_viewable(gtk_native_get_surface (native)))
         {
           g_object_unref (shortcut);
           continue;